Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 21 Dec 2011 10:00:10 +0000 (02:00 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 21 Dec 2011 10:00:10 +0000 (02:00 -0800)
commitfb3e9878fa95f42b55be7d3a029e8ee30c41b4fc
tree01e5c54ab40b1626ad8711c81c22a9eb9f3e157b
parentf974f0ed6d9829143a7294193e16d0fc23b70b7d
parente1d07264bee995ca58f6541aadd50586ea7bb3bd
Merge from trunk.